Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 26 Feb 2010 14:26:02 +0000 (14:26 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Fri, 26 Feb 2010 14:26:02 +0000 (14:26 +0000)

Trivial merge